Merge branch 'master' of git://www.denx.de/git/u-boot-coldfire
authorTom Rini <[email protected]>
Wed, 6 Nov 2013 21:18:25 +0000 (16:18 -0500)
committerTom Rini <[email protected]>
Wed, 6 Nov 2013 21:18:25 +0000 (16:18 -0500)

Trivial merge